Revision: bazaar--devo--1.2--patch-20
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Thu Feb 10 23:07:35 GMT 2005
Standard-date: 2005-02-10 23:07:35 GMT
Modified-files: libarch/apply-changeset.c
    libarch/conflict-handling.c tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-18
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-19
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-20
    thelove@canonical.com/bazaar--devo--1.2--patch-20
Summary: Wrote more tests for conflict handling, which showed some hidden bugs that this takes care of
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-18
   conflict handling now correctly deals with adding more conflict files

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-19
   I wrote more tests for the conflict handling, and it found a bug, which is fixed

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-20
   Brown paper bag mistake on not initializing tree_root

